From db778d68ddf6a1a77cad714c6f0be6ff1ebae402 Mon Sep 17 00:00:00 2001 From: "emellor@ewan" Date: Wed, 12 Oct 2005 12:04:45 +0100 Subject: [PATCH] Explicitly state which architectures are going to use /usr/lib64, to allow for the fact that Itanium does not. Signed-off-by: Ewan Mellor --- tools/python/xen/util/auxbin.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tools/python/xen/util/auxbin.py b/tools/python/xen/util/auxbin.py index b6ba6cff9f..06cd500b4b 100644 --- a/tools/python/xen/util/auxbin.py +++ b/tools/python/xen/util/auxbin.py @@ -19,6 +19,10 @@ LIB_BIN_32 = "/usr/lib/xen/bin" LIB_BIN_64 = "/usr/lib64/xen/bin" +## The architectures on which the LIB_BIN_64 directory is used. This +# deliberately excludes ia64. +LIB_64_ARCHS = [ 'x86_64', 'ppc64', 's390x', 'sparc64'] + import os import os.path @@ -38,7 +42,7 @@ def pathTo(exe): def path(): machine = os.uname()[4] - if machine.find('64') != -1 and os.path.exists(LIB_BIN_64): + if machine in LIB_64_ARCHS and os.path.exists(LIB_BIN_64): return LIB_BIN_64 else: return LIB_BIN_32 -- 2.30.2